adjusted the contoller and tests and added bootstrap#179